Added quiver fixed some stuff
Revert "Added quiver fixed some stuff"

This reverts commit ab6800184025ce97fc9ebcbd6ab4ea9bc56fa7e0.