New method that does NOT give warnings is working fine, about to cleanup code