Eighth Commit - Improvements,improvements,improve!