finishing up user branch