From fotTest Branch