getting changes from Heard library