Implemented partial solution after talking with Naomi