changed some stuff to make the court responsive