You are correct on both counts, SS!