Added method + logic fix