DF-1931, DF-1932, DF-1934, DF-1935. Added comments, added named constant instead of magic numbers