Updated for new requirements