method moved and some other small changes