Changed to discrete version for testing on server