Simple redesign
resolve merge conflict