added some things...