Some major Changes