all working with updated ui