Update

Renamed some variables. new method to obtain cases
Fix