got rid of AMMAR CONFIRM comments. ready to merge.