Trying to improve CRAP