added spice
merge the branches