Updated to meet new requirements