add spinner / not perfect   UPDATE