Changes suggested by @farpixel