make this automatic too