Updated to meet trillez post#4