Feature/ssd update