updated code with dashboard 12 dec 2014