Slightly better setup