Fixed up vesion