added shape stuff