Reverted the func moving