modified by gtimoteo
modified fixed conflicts