added falcon support