use std instead of boost - part 2