justin's changes and one of mine