bug fixing, adapted setup