Working to fix decay bug