improving base setup