cleaned up for titanium