Adding changes based on Lundy's feedback