updating and fixing...