updated version with click through