[PATCH 1/2] Integration with satyr