updated for Hafez