added more selfs