restructure, made player clickable