Final adjustment before submit