Merged some nasty JS