Getting myself back to Dejan's version