updated and delted cruft