simplified some methods