minor code change x2