Stefan and Luke working to get them right