cleaned up aps 13-bm