Reduce Account sharing

Let's start