Few improvements