Reverted to working model after some trouble