update working almost done