Updated and added new things