Some work + Hotfix