changed the way js returns
merge