update working, incremental changes