Update

more workings in progress