Fixed method two, refactored a bit