Target index added
model dependancy improved
special occasions refactored