Continued on the custom components