Changed a couple of methods from dynamic to static since it makes more sense