start working on make code faster