better nameing and direction