with pics
fix sample notification