Made code faster