Reworked SAFE distribution for users