improved memory footprint :)