commiting new final version
Fixing loader