few changes with the order of the methods in the .h and the .cpp