Sixth Commit - Improvements