Issues #2 & #3