return everything as a JSON with message
merge with master