Adding Model Where and Fixing Bugs