Updated to 2.0 (decided to use 2 numbers)