Make it more clean, and bugs fixed!
Safe to use