Correct somes bug with spinner function integration
merge some conflicts