Final changes for Jan 24 launch