changes after 06.04.2014 review