Server Update

Fixed looping issue