fixed and added