some added bugs