starting reflexion, cleaning code
conflits