some modififcations