import fixes successfully tested