Added some stuff from shadowbq Sagan-extras!