Changed to meet new requirements