#43 Moving methods to the proper place
#43 Fixed the issue and added a test activity to play with the values