changes to move servers
changes from live
bug fix