Some changes ~lazy~