minor modifications for branch merge