add more bounds everywhere