'rough version working
update