Some change/extra features