Design - changes by Emanuel