Took out loop in Server