Work on task #103 and #128