Some Changes here and there