cleaned up but errors