Syncing up with AotP version