Fixing contexts & a conditional statement