Readded missing code from last merge