added ibbignerd changes