pwds for heroku
fixed timed option
weird upstream merge thing