Added Logic