tried to shorten some things