Final basic changes before tranfer
Second final commmits before transfer