Fixat reflections
merge issues