0.0.0.8 - Function additions