almost fixed updates