Lots of changes
Removed loader