added support for shield