added spinner
merge conflicts settled