MODFIED: Removed Unnecessary Code