updated to use new inline list