addAfterP is done
changes
all merged and pretty