Added more void's and arrays