more changes on <16/09/2013>