and some more from feature 2 branch
more code