Newest version

Cleaned up a bit