Applied small changes