Litte more clean (not a lot :( )