actually fixed the crash problem this time, also reverted model back to a more understandle structure