Updated to work with yuglify