added .from (as suggested in #4)