Looks good for now.

Will further test it.