Changes made for White paper