changes syntax according to Johan