Feature/make more faster