Design - Changes by Sonia