ready to port
socket update for heroku failing