konfis 2015
older changes not committed yet