Changed to static calls of methods