Updated a lot!
Updated a bit