updated to 2.18 syntax