Main Method Fix