Working version
Cleanup
Fix order
Clean
Does not work again