added some selfs