Performance improvement (#6)