added tracking, cleaned up before publishing