change due to architecture implementation