Adjusted whole positions
Fix bug with relay connections