new version, simpler language