Few Changes here and there