More flexible
Cleaned