Updated with curse detetcion