updated imports as per #46