added more things waiting for nick