fixed and added next