cleaned up 30-50+