I know its a pain - but can we make this a club addon entry instead of core JEvents