Updated and added stuff