Junaid's custom module