removed event callback (still buggy)