Some impro for code