Last old style commit before new changes (as described in issues). Moving from hack to sexy implementation