added stuff :P
merged