branch grigra4 ( wip )