cosmetic changes
waiting for cond done
small mistake fixed
finished