Better replacing, update ui