Re-added Lau's changes