updated ap with various changes