some new tested crashcourse-2 stuff