Finished v4.0.4 update