Worked on server until it works