Updates to the previous post to fix stuff