2nd version, added labels