moved specific components out of locket