Beta 2.1 - removed conio and press enter stuff