Changed names and added Author