added small snipets lost in last merge