updated to use newer syntax