Tweak code some more