Cleaned up Fresh Version 1.0