Done merging with Alex's code