FIRST commit with changes to apply server connection