Implemented some of Asger's comments from today