added some consts for neatness