Feature / Fixes

Changes/Fixes the following feature

Have you added an explanation of what your changes do and why you'd like to include them?
Have you successfully tested your changes locally?

Changes