Added diagnals + new controls