Should this be moved to the end of the struct?