As discussed and again more changes!