T3 rehab 2 countpackages

@hagaressam  @mohamed-khairy  @YoussefSaleh  @sharkas911 @Ahmedheshamnasser