Modifications for Quails.