[2014-05-16] finish nazia's stuff