Some changes to shapes