Updated for new Requirements