Eb:8414- Changes made for consistency