Changed update-in ... (constantly ...) to assoc-in