fixed import, and shtuff