Changes, added functions