some small improvment i think