away with the hack - version 0.7.1