Continue dev. 27/1/14