Updated to latest BS
Merged