Minor changes + higher numbers