Re code for pre built world

Time to combine the branches