Working on the addition of aps