Added from Github, in class