Cleaned up measure Thorax support