finished shop()
merging changes