Okay, this is clean, keeping this until further testing is done