updated to rework syntax