Adding on to checker script, not tested yet