Finished more functionality