Oh and maybe make these calls public