added a simple version of star handling