working on making it work in server