modified logic
updated operation panel