Changed precision and fixed code form merge