More modular version + shader material test