updated to some underlying structures to prevent issues