v3.538

UPDATED More under the hood changes