Edited for HW
tracking added