Minor revisions based on func spec requirements