updating with Alex's changes