adding in server compatibility to main