Added better success/error handling.