improvements

Use salt for multiple instances