Added user + some logic