changed to make work on server