Added Logic 2