Add more reflections
Some more changes