Update for latest chages

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
Cover conditions

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>