Edited to follow the new name and author