Rest of changes mentioned before..