Pulling
Merge
Fixed issue with preview system