mahfuz110244 7th commit