Some changes

Commited by rtrv