updated version
Updates to functions