A bit of file reorganization, possibility to delete condition