Added console check everywhere