Re-added some stuff to be and asshole