Slight changes and finetuned details