small optimalization update