added some user support