Preparing for REV B
Todo changes
Todo changes for REV B