work in progress
full update