Some changes but still no compile luck