Major functions added