Added new logics for Squirrel