Shield + some new functions added