socket changes (forgot to commit/push)