more pretty of missing blocks
merge from origin/master