shape selection working now