merged with work of goa-tz, tested quite well, works with fuerte as well