updated base setup