Not using click
Fixin bugs