final changes, need to make it start on click