now aligned with create-js branch