@803 this how we should draft