completed editing, added return false statement