some fix
Next Step
Merge branch 'draft'