Finished up, everything seems to work, as I want.