few changes on showcase part