Finished issues #1 and #2 for the existing code.