Comment this logic please