Main function now included