Added -partition switch