Changes for it to work on remote server