Added alot of initial updates