added extra components