APSA tracking hopefully
Making some changes