Further improvements made