added some things)