added more self-fucking controls