Fixed my issues with Alex's commit