Mob 709

Don't merge -> Code Review

@Hakubo - hey, does it make sense to you?