Updates for better fit