updated and fix