Issues #1 & #3