Reworked after re-review.

Signed-off-by: Attila Vamos <attila.vamos@gmail.com>