Improved @author