Adjusting task to normalize data
Adding updates from Mikael
Ran build task with latest menu