edit 2.2: rectified work so far