Added #28 and #30