Added a few more changes into the mix, for side project.