Work on shield - Done - Needs revision