New version of massage project on 01-11-2014 Cleanup