Added some stuff for bill warn testing