Major fix: Fixed dim for bs TODO generate \theta