better code support (simplified)