Changed struct overall.