Fixed corrupted method
fixed conflicts to merge from vasilis