demo model
fixing issues