Updated to match the current implementation