Update Draft

Update some functions. Still need improve them