added cool checks
fixed merge