Update from norpchen (nerd fork)