Updated for ui modifications