assess 1 draft 1
fixed some bugs