Rupas new changes

Does not seem to work atm