Updated for better testing