Design - Changes done by Sonia