delete and re-write

re-write needed