WIP fixing at friends house