More math tuning