Auto detection not really working..removing for now