another update with sticking closer to STS-Dev-Team & razrqcom-dev-team