[PATCH] More function moving