Added ch5 and ch6 stuff