final two changes