fix justin's problems