Updates for shields and crystal