I refacted or something not really sure