tweeking some methods