As 6.0 update