some fixed WIP, Alert!!