Finally Working Corectly