Renamed
Clean up and add examples