fixed graduent bugs