Final changes for the night - revert if doesn't work