fixed and done