Updated according to last updates in rSYBL