last update working almost everything