more additions and sort out