Arza changes from fork