Prep for #3 and completed #5