Issue #1 and #3: Updated relevant files with new method. Everything is up to date.