added all changes, same as heroku