Code Review

Please go over the implementation, see the differences then test the changes i have made in your code.