Think this is a better build, more stable at least