lots of changes to alle the early parts