enabled specifying from
fixed stuff a bit