Code

Merge branch 'js/apply-recount'