Updated for Stub Usage