Made sus be a bit more generic