Changed it to a struct