DW: Removed hard coding and used the global constant