Put the final touches on this change