updated master to current code