Design - changes by Gaurav