Further updates

I need further input from the team, reply/add information a soon as
possible.