Original commit of AI changes