UPDATE: Implemented suggested changes