Updated to version 2 design