local changes to add stars and images
merge solved