First suggestions from Christina implemented