streamlined some methods