update to current implementation