Changes based on couzteau's feedback
Removing live-preview improvements (based on jasonsanjose's comment)