moved some tish around