UI modified v2.0