Tweaked so works with the chrs correctly