first draft for final
update