Committed changes and added some functions