Added changes by chasseurmic