re-wrote to use akkamaddiCore