final changes by mifta