From last round of edits, removed some superfluous js