Merging Back to davidnunez