smitter is born
merged in changes