[WIP] changing functionality to be compatible with the needs of our dev-ops team