added code and deleted junk