few changes applied to the class to check its behaviour.