Move everything to static, use static tag