better piece tracking