changed full sructure