added more methods, no longer static