checkpoint for picc refactor