pulling Marko & Travis' changes