updated to use recommended approach