Added all current code for all components