Design Changes made -Jay