Commented out duplicate code. Need to refactor, with Alex's changes.