same changes as the other branch but this branch is from master instead of the kraken integration branch