added print stuff
merged