Adding my changes that may be useful