UpdatedListener improved