Added support for #12, #6, and #7