better handling of all things