updating v2, unfinished w/o modals