Update for the current implementation-in-progress