improved fabfile