add pop back - some other changes