added user parsing, more mess to clean up :)