My patches for Taberareloo