Simpler ways of doing things (stills run on linux and macosx, tested!!)