#2 Some changes

add changes