first commit of amandap 11-15-14