Some changes to make the code more ugly