Removed and added functions