Lots of changes, removed version number, little but cleaner