some changes to old version