Some changes to get it right