consolidated some methods