MAJOR API CHANGE (everything into global r/$)