import improvements (by Eran)