more optimization :|