modified for demo version & label design
modified