Feature/rs gen usage

again