Feature/brian 2.4