added some humor
merge optimized