Committing latest changes as received.