Final Version of the non console version