next version, more code