Modifies for remote server use