revamp for 1 less service