Remove commented code and added a new method