updated version, ready for pub