Modifications

Modification to stock components.