updated tracking code and switched to htmlbp optimised version