sync local changes as of 16/10/14