Updated after code-review