update with better UI