updating and fix