Further fixes, adds different approach using STATIC