Fayzan Zahid (Fiz)

Doing some enhancements