final fixs