BerryClip handling added