added some modeling work