small changes that Dejan suggested