author changes made more compact