Next change of code. Update 6 pm 22 april, 2014