final changes, i guess