refactored a[p to new data model