Yeah, would be probably a bit faster, will update