Added final changes to move everything old to version 6