Further work done to moderator functions