Tweak based on testing, remove logging