more code re-arrange..