Completed enhancements #16, #17, #18 and #19