Working prototype with static fix