more stuff
merged
added behaviour