Fixed salt requirement(?)
Fixed merge conflicts