more fabfile improvement