Changed it to no longer have arrays