More work on model