[0002] Some design added