Added some of Leif's ideas