My few changes