New version

changes and fixed many code. Project optimized.