done some modification -still cant add