Added gabe's new feature
Removed the new feature
Completed feature