Reworked JS with JQ