updates to split everything up