Updated for Akilia sync