Seems like you have everything figured out based on the info you posted