updates, trying to remove jquery as much as possible