added cut & paste and junit