Adjust to a safer, more realistic and agnostic approach