More functions + logic tweak for single events