updated to modern syntax