change to use chocolate ui stuff