added spinner
have no idead what it is
merge, add spinner