fixed and updated