Fleshed out update