added partial handiling