Add Some changes

=) may be last