Updated to remove jquery