small changes due to practical problems