Readded my new RayGun features