Added more NEEDS