Updated groundwork setup