Second Update

Added main two functions