added shape and shapeset