Updated with Second Test