Updated to make updates work a bit better.