upgraded shapes handler to new (non layer) system