Cleaned up the version 1.0