Function has little improvements