Added separate diagnostic program