Updated onclick, testing