Changes that seem to allow the poisson to work correctly (without proper
testing)