Trying to improve sanity