EDITED FROM GITHUB