Added support for non 4chanX