C2 heba final user editing

@AbdelrahmanAyad please review this branch instead of the other #97