Need to close components differently