Updated to new requirements