Updated to one array and cleaned up create function