Updated from jsfiddle changes