Should be done with check 8 implementation, will test now