hopefully, all the final changes