Added more changes fixed most stuff (Welly / Awais )