added by safeer