Refactoring + 60 seconds songs added.