Implemented suggestions from Gabe