fixed connection stuff