@bantu so is this correct as is now?