Layout updated to omit gsub