moved star check earlier