merge after meeting on 16/5/13