LRA-192 : Point 1, 5, 7 are fixed