justin's changes