Redid some derivation rules