another update to lessen http traffic
Moved logic to prevent unneeded server calls