modified for ui changes