Main

replaced out of date method