updated to have testing code
merge