changed onFieldClick but still ptoblem with this in the method
Merged master fixed conflict.