some changes by burnoutberni