Use proper blocks