fixed d maybe added consts