removed inling from some methods