Work on tasks #344 and #345