Fixed user the be non-static and more drawbles