streamlined some aspects