change it to be valid on server