major changes

Signed-off-by: Sascha Sigl <si@ad-modum.com>