merge latest jason for cleaned up require paths