demo ready
fixed bug