mahmudahsan code updates