updated to 6.0.2
merging