Updated Siphon merge with new controller;